Added compatibility