Update API code
Merge branch 'pushalot'