Added unit test coverage for DB
Added extra preference options + implementation
Fixed Preference Implementation