Slight changes to the Context file and Database