Fixed up User structure so can be used in UserEntity and rework MediaSize structure