fixed: dev generator (still need some refactoring)