Refactor IDL storage