It can be done later, separate issue for that imo