Ran into some issues with Criteria API and such. see #39