Adding Static Context and some fixings in database