Change to use uniform initialization