BaseEntity -> Entity (renamed class)
Merge remote-tracking branch 'origin/master'