Move resource options to Options object