Added new mapper.php
Refactored marshaller.php with new VolatileFunction