Adding more completeness to the APIs