Added multiple entries handling