Added more infra code to build seli