Delayed initialization added.