Add switch to avoid string concatination