Modifications on Agent class