Could you change those to class and method references.