Some changes for better IDs support

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>