Added the functionality to the main non-generic file.