Moved DAO to plugin