Removed check for type in messages