Add some advanced stuff