Major updates - added more functionality