Added basic extensions code