Added more #defines