Added compatibility layer