[refac] refactoring + raw type + unserialize defaults