Use separate class for messages operations