Started refactoring process to make it clearer and more focused API