Added entity converters