Removed implementation classes

Updated interfaces with more information