Implemented proper source building