Changed Initialization and Database Lookup