Several Changes

1.  Timeout support
2.  Optional Admin Queue support