Added option for constants