Moved all customization in my custom vendor