Added basic functionatly