Add enhanced param and return messages