Added compatibility check, removed unused method.