'Unbreaking' public API