Added first/last feature