Updated handling of internal attributes