Add requirements and message handling