Client-side Base improvements