Better approach for packaging