Adding initial setup