Fixed Create/Update functionality