Added constants, method definitions