Added api and user management