added user and component definitions