Most methods added