Updating API layers to fit documentation