Make the wrapper more dynamic