Messages refactor done