Adding long option structs and code