Update API to more fine grained