Fixed create and update methods