Added options, changed data structures
Added options, changed data structures