Update API to be instance specific