Message review; FOM removed
Message refactoring