Add more basic functionality