#1045 Making a disctinction between internal and external api