Fixed serialization error, TODO update