Improve prepare_basic_props fun