Made almost the same interface like in current version.