 After leaving office he remained involved as a legal expert within government working groups preparing draft legislation as the deputy chairman of the working group preparing the draft law on Restitution of confiscated church property (adopted by Parliament in 2006).He was also the chairman of the working group preparing the draft law on restitution of nationalised and confiscated property in 2001 (which was based on the premise of "restitutio in rem" (return of the original property ), and was a member of working groups preparing the law on Rehabilitation of political prisoners (adopted by Parliament in 2005) and the law on registration and evidencing of nationalised/confiscated property (adopted by Parliament in 2005).He also campaigned for the adoption of legislation on lustration of communist apparatchiks especially within the government, judiciary and the police (such laws having been adopted in post-communist countries including Poland, Czech Republic and Hungary).