changed addDecls
removed support from variables again (experimental)