Added new interfaces and tests