Some defines added