Simplify compatibility code