removing dependency on jingle based classes