Bugfix/api requirement