Cleanup - return PropertyAttributes directly