Added final methods for v1