Removed usage of primitive types in model entities to avoid potential XML parser issues.