Object and Application component improvements