Added compatibility functions (without tests)
Added compatibility functions and tests