Refactored service & model tier to utilise SalatDAO