Moving everything to instance attributes to make pickle happy