Adding CF support to new orm