Added constants and javadoc