Major change, API is uncompatible. Refactoring of size handling