removed Abstract and Domain, fixed references