Fix the initialization and API objects concept