New components and code re-factoring