It will be added in a separate issue as not to cause any problems for the developers now.