Hmm... this should already have happened in the class metadata