Merge with AppModel Changes
Updates to graphiti