You're right, that would probably be a better way to handle these.