Support flexible marker definitions, multiple markers
Set up unit tests