Updated to work with latest master