[Matahari] making out of the box usage/setup easier