Added new modules and features