Added change to make msg size configurable