Reworked defineables and intelligence