First steps to adding serialization and categories