Added subscriber activation functionality
Removed obsolete model
Merge with development