refactoring api; change api answer object