Improved build system and translation