New methods and generic added