Updated account schema
Updated controller
Updated templates