Added some options and remaps