Add constants check, revise direct access check