Updated to include my extensions as submodules