add component and util classes