Add helper methods
Handle nullable values