Updated to match server-side changes
Updated to V4.1.2