Make accept states more OO