[sprint 6] registration fix + serializable fix