Add more literal support