Headers changed now in all classes. Close #17 issue