Added basic features