Changes for API