Removed shortcut methods.
Added compatibility checker.