Extract more constants