More method to support new functionalities