Added constants and updated properties

Added constants and updated properties