split of interfaces
adaptions to use new splitted interfaces