Major updates v1.0