Fix #2, implement a new class to handle formatted options