Misc

Added extension capability, router updates for caching.