Added notifications
Revamped the API