Fix issue with modfiers on embedded classes