Work on api schema