More constants and documentation