Plugin Keys: Code restructure