Adding modules for sprint 2/3