Adding Extensions and other stuff