More cast and lazy load updates