Added in changes to the framework to enable the system to work on GAE.