Updated and tested
Updated with tests and new dialect ie bean:use