Finished migration from DAO to Bean \o/