Source class updates