Added missing variables to constructor where they belong