Done more object encapsulation