Entity support - DO NOT MERGE