Better subject build script