Add Working directory + Fix API names