Add some extra features