Add conditional loaders & comments