Moved interfaces into Framework