More constructor modifications