Updated branch for genweb.core