Added hardcoded constants in for message components