add lazy load option to create and cleanup