Added tables for shortcuts