Remove unneccessary class and add generic type ?
Configure State's Type and special transition