Small changes in naming
Some kind of API added; impl changes