Updated markers + call/message feature