Added options so each feature can be disabled / enabled by the user