Adds version 3 features