Updated to new constant names from framed