bringing back declaration and source mapping.