diff --git a/Command/SendCommand.php b/Command/SendCommand.php
index 1290164..31b837a 100644
--- a/Command/SendCommand.php
+++ b/Command/SendCommand.php
@@ -1,5 +1,5 @@
 <?php
-namespace GergelyPolonkai\SMSSenderBundle\Command;
+namespace GergelyPolonkai\SmsSenderBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/Model/SpooledSms.php b/Model/SpooledSms.php
new file mode 100644
index 0000000..b3e1f97
--- /dev/null
+++ b/Model/SpooledSms.php
@@ -0,0 +1,50 @@
+<?php
+namespace GergelyPolonkai\SmsSenderBundle\Model;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Entity to spool SMS messages
+ *
+ * @ORM\MappedSuperclass
+ */
+class SpooledSms
+{
+    /**
+     * The recipient's mobile phone number
+     *
+     * @var string $recipient
+     *
+     * @ORM\Column(type="string", length=30, nullable=false)
+     */
+    protected $recipient;
+
+    /**
+     * The message itself
+     *
+     * @var string $message
+     *
+     * @ORM\Column(type="text", nullable=false)
+     */
+    protected $message;
+
+    /**
+     * Password locations. This must be an array of arrays containing the
+     * password's location and length
+     *
+     * @var array $passwordLocations
+     *
+     * @ORM\Column(type="array", name="password_locations", nullable=true)
+     */
+    protected $passwordLocations;
+
+    /**
+     * True if the message is already sent
+     *
+     * @var boolean $sent
+     *
+     * @ORM\Column(type="boolean", nullable=false)
+     */
+    protected $sent;
+}
+
diff --git a/Service/Sender.php b/Service/Sender.php
index fddf130..731faea 100644
--- a/Service/Sender.php
+++ b/Service/Sender.php
@@ -1,5 +1,5 @@
 <?php
-namespace GergelyPolonkai\SMSSenderBundle\Service;
+namespace GergelyPolonkai\SmsSenderBundle\Service;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use RuntimeException;