adaptions to use new splitted interfaces (also for Android)