Added handler for container