Modified format for ORM functionality. Test on separate shell with
minimal functionality.