More basic features added