Add keys and remove static content