Updated to latest BP-Schema-tools