Add config and resource traits
Change interfaces names