Some setup things added