Added simple DAO and tests