Improve parameter building, update version