Moved API to Factories