Bug Fix: Support service annotation in update and create methods