Types added
Some defines