moved to component namespace