Commit #29 different markers for different types