Extend Beaker DSL with cfacter
Update schema naming, and fixes for preserve nodes