Reorganize constructor params and prepare for 0.3.3