Working on better parser