Refactoring
Adding Entities
Minor Fixes
Remove response entity