Updated Source class