Added remaining attributes