Added implem support + quick generating fixes