[fix] More debugging
[fix] Migrated to predefine.lazy