Added new interfaces and tests. Needs implementation