Adding DAO layer - refactored account service