Moved shortcut methods from __init__ for shortcuts, so that __init__ only has versioning. Updated docs and tests accordingly.