Added more shorthands