Ok, we can move that out for now, it could be added later, if we want (maybe with more automated way for doing it)