More constructor work