[Matahari] First pass of updated features