Added functionality for API