add: components for use with support lib