Should be removed with Version 1.0.1.0