Feature/future parser