Few updates in API and frontend