Making Entity types final due to concurrency concerns