diff --git a/include/transport/userregistration.h b/include/transport/userregistration.h
index e6e614b9304741e4d540025ef178b07a74c14fdc..b4c5a13fef7bdab61ea2e93009e715f56f8148be 100644
--- a/include/transport/userregistration.h
+++ b/include/transport/userregistration.h
@@ -36,7 +36,7 @@ class UserManager;
 class Config;
 
 /// Allows users to register the transport using service discovery.
-class UserRegistration : public Swift::Responder<Swift::InBandRegistrationPayload> {
+class UserRegistration {
 	public:
 		/// Creates new UserRegistration handler.
 		/// \param component Component associated with this class
@@ -45,7 +45,7 @@ class UserRegistration : public Swift::Responder<Swift::InBandRegistrationPayloa
 		UserRegistration(Component *component, UserManager *userManager, StorageBackend *storageBackend);
 
 		/// Destroys UserRegistration.
-		~UserRegistration();
+		virtual ~UserRegistration();
 
 		/// Registers new user. This function stores user into database and subscribe user to transport.
 		/// \param userInfo UserInfo struct with informations about registered user
@@ -58,6 +58,17 @@ class UserRegistration : public Swift::Responder<Swift::InBandRegistrationPayloa
 		/// \return false if there is no such user registered
 		bool unregisterUser(const std::string &barejid);
 
+		/// Registers new user. This function stores user into database and subscribe user to transport.
+		/// \param userInfo UserInfo struct with informations about registered user
+		/// \return false if user is already registered
+		virtual bool doUserRegistration(const UserInfo &userInfo) = 0;
+
+		/// Unregisters user. This function removes all data about user from databa, unsubscribe all buddies
+		/// managed by this transport and disconnects user if he's connected.
+		/// \param barejid bare JID of user to unregister
+		/// \return false if there is no such user registered
+		virtual bool doUserUnregistration(const UserInfo &userInfo) = 0;
+
 		/// Called when new user has been registered.
 		/// \param userInfo UserInfo struct with informations about user
 		boost::signal<void (const UserInfo &userInfo)> onUserRegistered;
@@ -71,14 +82,6 @@ class UserRegistration : public Swift::Responder<Swift::InBandRegistrationPayloa
 		boost::signal<void (const UserInfo &userInfo)> onUserUpdated;
 
 	private:
-		virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::InBandRegistrationPayload> payload);
-		virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::InBandRegistrationPayload> payload);
-
-		void handleRegisterRemoteRosterResponse(boost::shared_ptr<Swift::RosterPayload> payload, Swift::ErrorPayload::ref error, const UserInfo &row);
-		void handleUnregisterRemoteRosterResponse(boost::shared_ptr<Swift::RosterPayload> payload, Swift::ErrorPayload::ref error, const std::string &barejid);
-		boost::shared_ptr<Swift::InBandRegistrationPayload> generateInBandRegistrationPayload(const Swift::JID& from);
-		Swift::Form::ref generateRegistrationForm(const UserInfo &res, bool registered);
-		
 		Component *m_component;
 		StorageBackend *m_storageBackend;
 		UserManager *m_userManager;