Changed Origins to an interface for more flexibility
Fix so SetContext is always called even if no Origin set