Added and fixed methods