Added a few shortcuts