Fixed issues with entity attributes