Exteended with some lines regarding build process