Special-signature refactor

Refactored definition file to include special-signature definition on
relevant methods.