fixes in api functionality
fixes in api functionality