Better handling of OPTIONS and TRACE
Safety enum added
Removed unused imports