Added better 'has' specifiers. [Unfinished]