Added more then one and non integer primary key support