Updated skeleton for use with 1.6