Add staticmethod and fix issue with class separator