Move attribute extraction to principal and traverse attributes hash to set any other values not hard-coded