Add External Source and Fix Exceptions