(#34) Refactored and changed success response