Minor changes on API