Updated API, removed dependencies from detailed implementation aspects,
defined according spis.