adding initial module support