Added manifest modification ability, and mako props