Added External Resource Field
Merge with Fabian Master