Add lazy initialization (refs #3)