Improve access to options hash and avoid clash with options method!