Adding more featues to make API compliant