Redefined property packing for more flexibility