Added todo about lazy generation