Updated for adding Combat class