Updates with latest language features