Better version of Entry + Better Javadoc