Added compatibility feature