Added checking for static constants