Moved some hardcoded values out to a configuration file