Added lazy thunks.