Updated Source and Entry model