Core changes, adding icon and change declaration method