Adapt convenience function to actual needs