Added constants, provision to detect the os