Added some ops
Added resource server support