Handling options hash correctly