Shouldn't this class be in a separate file? I saw some venders have a "agent" sub directory for agent related code. We may want to have that as well.