Add base to context, some property creation code changes