Added support for field tracking
Allow source fields to be read from file
Use the new Enum for instruction type recognision