Refactor DAO and services + properties