Refactor pioneer to accept option hashes