Added missing components/classes and merged pending changes