Added markup configuration, etc.