Cleaned up the build process.
Fixed mapping name issue in descriptors