Adding support for shortcuts