Fixed changes on API