Client-side definitions tweaks.

The initent of the PR is to make the client side data available as early as possible to other scripts.