Added bootstrap & refactored transformers