Updated code base to latest version