Add exists check
Add tests for new interfaces