Added a few things for the initial setup