Added more constants