Added some more work for implicit things