Added new methods and slightly modified some default behaviors