Removed dependency on additional list - this version is for prod