Updated build scripts
Updated classes