Added many new methods