Moved to a common configuration