Added enum, and some simple options