Added more components to framework