Added more operators and constants