Added support to modifications