Added basic things for upcoming commands