Stop that generic madness, make API more safe
This will most likely break all current plugins