Some shortcuts added.