partial rewrite
working DSLContext bean
working rewrite