Added support to get a single call and updated notifications to use more general variable names, ready for refactor later