Changed variable obtaining type.
Ensured that proper symbols are being resolved.
Includes and changing of calls.