Implement unsupported methods, add TODO