Moved configuration out to separate file...