api and project-handler changes