Now conforms to the new expected API Format