Fixed issues with rest framework issues and new decorators