VisibleEntity just complicates class hierarchy.
Cleaning code and refactoring.