Added new modules and support files