Modified Container Module, based on Updates on Database.