Really add appropriate class inclusions