Working on messages and catalogue API