Initial setup + plugins changes