Added options, ts file parsing