Plugins added + some other code