Upgraded to 0.9.0.1 and made changes to keep compatability