Updated skeleton with latest from baseline