migrated to latest version of dandelion and jadira-usertype