Fully updated EmptyAPI