Switching to options hash instead of optional params