Changed parameter to options hash to ease maintainance