Updated interfaces and added comments
Tests were updated