Trying to work around the single persistence context issue...