Add lazy object graph initialization;