Added constants and utilty methods