Added option to include any attribute type