removed class decorators because of Python 2.5 :(