Revamped structure and better integration with plugins