Editted definitions to add AP