Major updates and additions