New methods added, bug fixes