Updated for new Source keywords