Changed API to a submodule