Code Format
Added one feature to data manager
Stub for the extra feature
Controller implementation