Few TODO fixed: calls to super-method and constants.