Added Subject id and minor fix's