Improving message creation on the wrapper for GUI