Added basic constants handling