Updated Components for Creator 3.1