Enhance community build