Updates to API
Performance improvements
Tests up to date