Asynchronous prompting

More fixes for modularised codebase.

http://jira.webinos.org/browse/WP-956