Include initial record plugin
Code cleanup / rename