Updated with latest source changes