Added @Last and @First modifiers