Feel free to file a ticket for a later refactoring :smile: