Add more modifiers and update TODO