added some classes for dev
fix from rebase