Terrible Javadoc + Entity Improvement