Added TODO and dynamic class enhancement example