Make manifest methods a little more functional