Added Modules and update to account controller