More compatibility added