ported wms support managing correct source() parsing
updated version related to wms support managing correct source() parsing
commited compiled code