Making Parameters more available as well as restructuring them