Made class metadata optional