Added custom combinator functions for list/option