Add some wrapping for pre