Modularize markers for easier modification