Update to v2.0

Update some functions and views