WIP: Add raw advertisement support