Changes for specialization in makara to leverage dust.onLoad