Move UpdateUserId to separate query function
Move UpdateAttribute into query model
Move UpdateSignature to query model