Fixed API and include