#25 Created more modules for various API