Started working on 1.8 support