Fixes #8 add support for dao builder