More functional changes to accomodate Wonderland changes