Add some extra stuff