Add simple entry parsing