Completing object-oriented implementation