Code refactor couple of methods has been marked as final.
DAO has been re-factored to support composition over inheritance.