Feature: updated with new methods