Class build update