Added lib and serialization