Modifier types + some other updates