Add frontend shortcuts on 2.1