updated wicket related impl.