Added API_MESSAGE option