Ease the way for future improvements :)