Updated how object maps handle cast