Rename common -> indicator. Added new common