Add some extra optimization