Better constructor element handling