Update usage and add TODO