Added basic marker parsing